From 0df83ebb364068f5657fca9fdf7a7044adfd619d Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 15 Jul 2009 14:35:34 +0100 Subject: [PATCH] i386: eliminate unsupported CPUs' MCA handling code Neither Intel P5 nor Winchip are supported by Xen (due to -march=i686 being passed to the compiler), so there is no point in having code for handling their (rudimentary) MCA capabilities. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/Makefile | 2 -- xen/arch/x86/cpu/mcheck/mce.c | 14 --------- xen/arch/x86/cpu/mcheck/mce.h | 2 -- xen/arch/x86/cpu/mcheck/p5.c | 50 ------------------------------- xen/arch/x86/cpu/mcheck/winchip.c | 39 ------------------------ 5 files changed, 107 deletions(-) delete mode 100644 xen/arch/x86/cpu/mcheck/p5.c delete mode 100644 xen/arch/x86/cpu/mcheck/winchip.c diff --git a/xen/arch/x86/cpu/mcheck/Makefile b/xen/arch/x86/cpu/mcheck/Makefile index ed0ae00058..5aa637a4e0 100644 --- a/xen/arch/x86/cpu/mcheck/Makefile +++ b/xen/arch/x86/cpu/mcheck/Makefile @@ -6,5 +6,3 @@ obj-y += mctelem.o obj-y += mce.o obj-y += mce_intel.o obj-y += non-fatal.o -obj-$(x86_32) += p5.o -obj-$(x86_32) += winchip.o diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 01feaab251..234efbb271 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -616,12 +616,6 @@ void mcheck_init(struct cpuinfo_x86 *c) case X86_VENDOR_INTEL: switch (c->x86) { - case 5: -#ifndef CONFIG_X86_64 - inited = intel_p5_mcheck_init(c); -#endif - break; - case 6: case 15: inited = intel_mcheck_init(c); @@ -629,14 +623,6 @@ void mcheck_init(struct cpuinfo_x86 *c) } break; -#ifndef CONFIG_X86_64 - case X86_VENDOR_CENTAUR: - if (c->x86==5) { - inited = winchip_mcheck_init(c); - } - break; -#endif - default: break; } diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 78856cf89a..8186ac44cf 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -17,8 +17,6 @@ int amd_k7_mcheck_init(struct cpuinfo_x86 *c); int amd_k8_mcheck_init(struct cpuinfo_x86 *c); int amd_f10_mcheck_init(struct cpuinfo_x86 *c); -int intel_p5_mcheck_init(struct cpuinfo_x86 *c); -int winchip_mcheck_init(struct cpuinfo_x86 *c); int intel_mcheck_init(struct cpuinfo_x86 *c); void intel_mcheck_timer(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/mcheck/p5.c b/xen/arch/x86/cpu/mcheck/p5.c deleted file mode 100644 index 4106cbcf53..0000000000 --- a/xen/arch/x86/cpu/mcheck/p5.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * P5 specific Machine Check Exception Reporting - * (C) Copyright 2002 Alan Cox - */ - -#include -#include -#include -#include - -#include -#include -#include - -#include "mce.h" -#include "x86_mca.h" - -/* Machine check handler for Pentium class Intel */ -static void pentium_machine_check(struct cpu_user_regs * regs, long error_code) -{ - u32 loaddr, hi, lotype; - rdmsr(MSR_IA32_P5_MC_ADDR, loaddr, hi); - rdmsr(MSR_IA32_P5_MC_TYPE, lotype, hi); - printk(KERN_EMERG "CPU#%d: Machine Check Exception: 0x%8X (type 0x%8X).\n", smp_processor_id(), loaddr, lotype); - if(lotype&(1<<5)) - printk(KERN_EMERG "CPU#%d: Possible thermal failure (CPU on fire ?).\n", smp_processor_id()); - add_taint(TAINT_MACHINE_CHECK); -} - -/* Set up machine check reporting for processors with Intel style MCE */ -int intel_p5_mcheck_init(struct cpuinfo_x86 *c) -{ - u32 l, h; - - /* Default P5 to off as its often misconnected */ - if(mce_disabled != -1) - return 0; - x86_mce_vector_register(pentium_machine_check); - - /* Read registers before enabling */ - rdmsr(MSR_IA32_P5_MC_ADDR, l, h); - rdmsr(MSR_IA32_P5_MC_TYPE, l, h); - printk(KERN_INFO "Intel old style machine check architecture supported.\n"); - - /* Enable MCE */ - set_in_cr4(X86_CR4_MCE); - printk(KERN_INFO "Intel old style machine check reporting enabled on CPU#%d.\n", smp_processor_id()); - - return 1; -} diff --git a/xen/arch/x86/cpu/mcheck/winchip.c b/xen/arch/x86/cpu/mcheck/winchip.c deleted file mode 100644 index 6dede3796f..0000000000 --- a/xen/arch/x86/cpu/mcheck/winchip.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * IDT Winchip specific Machine Check Exception Reporting - * (C) Copyright 2002 Alan Cox - */ - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "mce.h" - -/* Machine check handler for WinChip C6 */ -static void winchip_machine_check(struct cpu_user_regs * regs, long error_code) -{ - printk(KERN_EMERG "CPU0: Machine Check Exception.\n"); - add_taint(TAINT_MACHINE_CHECK); -} - -/* Set up machine check reporting on the Winchip C6 series */ -int winchip_mcheck_init(struct cpuinfo_x86 *c) -{ - u32 lo, hi; - - wmb(); - x86_mce_vector_register(winchip_machine_check); - rdmsr(MSR_IDT_FCR1, lo, hi); - lo|= (1<<2); /* Enable EIERRINT (int 18 MCE) */ - lo&= ~(1<<4); /* Enable MCE */ - wrmsr(MSR_IDT_FCR1, lo, hi); - set_in_cr4(X86_CR4_MCE); - printk(KERN_INFO "Winchip machine check reporting enabled on CPU#0.\n"); - return (1); -} -- 2.30.2